[Backport 2.x] Fit and Finish UX Fixes #267
+163
−174
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.